Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Tue, 23 Feb 2010 21:58:05 +0000 (21:58 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Tue, 23 Feb 2010 21:58:05 +0000 (21:58 +0000)
commit32e6c6733b4a430e2888304be92773eb4b65b3f0
treeb1ec8031d2f2c7dc4e9a76d27031cb4246bc87c0
parentc38b83ffff75f09faa3a2d892ea3232abd4180c2
parent326ecac8fdac4e5f0e2e30dcb5fc043e6b91a7d9
Merge from mainline.